From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 26 Sep 2011 08:51:10 +0000 (+0200)
Subject: telepathyClient: call delay on context when approving a FT or call
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7550
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=00384ccb472a5ae9997e9e6fa6e61321d5e54497;p=gnome-shell.git

telepathyClient: call delay on context when approving a FT or call

Not doing so is considered as a bug as we don't accept the context right away.
It leads to tp-glib returning directly from the AddDispatchOperation() D-Bus
call and so automatically approve the channel if the Shell is the only
approver running.

https://bugzilla.gnome.org/show_bug.cgi?id=660084
---

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 4bd5097f4..43e142317 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -305,6 +305,8 @@ Client.prototype = {
         Shell.get_tp_contacts(conn, [targetHandle],
                 contactFeatures,
                 Lang.bind(this, this._createAudioVideoSource, channel, context, dispatchOp));
+
+        context.delay();
     },
 
     _createAudioVideoSource: function(connection, contacts, failed, channel, context, dispatchOp) {
@@ -338,6 +340,8 @@ Client.prototype = {
         Shell.get_tp_contacts(conn, [targetHandle],
                 contactFeatures,
                 Lang.bind(this, this._createFileTransferSource, channel, context, dispatchOp));
+
+        context.delay();
     },
 
     _createFileTransferSource: function(connection, contacts, failed, channel, context, dispatchOp) {